Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next release #74

Merged
merged 39 commits into from
Mar 12, 2016
Merged

Next release #74

merged 39 commits into from
Mar 12, 2016

Conversation

sigveka
Copy link
Contributor

@sigveka sigveka commented Feb 13, 2016

Regarding module names:

Do we want to force the author of an application to give the python module the same name as the surrogate model _id?

Using the current structure the following is required (according to method loadFromModule in SurrogateModel.py):

Surrogate model:

_id = "SuperCFDmodel[A=water]"

And the directory structure:

MoDeNaModels/SuperCFDmodel/__init__.py

Alternatively it would be possible to parse all the modules to locate the appropriate _id before importing the module.

Sigve Karolius and others added 30 commits December 9, 2015 17:21
…r necessary to add PYTHONPATH to models directory
Conflicts:
	applications/PUfoam/MoDeNaModels/FoamConstruction/run
restoring missing files for foam reconstruction (deleted at merging)
Fixed 'strange problem', forgot to define IndsxSet
Sigve Karolius added 4 commits January 22, 2016 09:59
Merge remote-tracking branch 'upstream/nextRelease' into nextRelease
"Merging Henriks MoDeNa nextReleaseO"
Merge remote-tracking branch 'upstream/nextRelease' into nextRelease
"Merging Henriks MoDeNa nextReleaseO"
@henrus
Copy link
Member

henrus commented Feb 17, 2016

Contains SpherePackFB.exe AND duplicates contaminated history. Rejected.

henrus added a commit that referenced this pull request Mar 12, 2016
@henrus henrus merged commit 6dc401b into MoDeNa-EUProject:nextRelease Mar 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants